From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 22 Feb 2011 16:40:32 +0000 (+0100)
Subject: panel: Defer adding the user status menu to the manager
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8904
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=867c9a19ae84db5bbd96b4a85ca62f4da16138c9;p=gnome-shell.git

panel: Defer adding the user status menu to the manager

PopupMenuManager relies on menus being added in the order of the
menu buttons they are attached to, so defer adding the user status
menu until the status icon menus have been added to make the manager
happy.
---

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 1c23ae8d0..4cedb442b 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -874,7 +874,6 @@ Panel.prototype = {
 
         this._statusmenu = new StatusMenu.StatusMenuButton();
         this._statusmenu.actor.name = 'panelStatus';
-        this._menus.addMenu(this._statusmenu.menu);
         this._rightBox.add(this._statusmenu.actor);
 
         // Synchronize the buttons pseudo classes with its corner
@@ -951,6 +950,10 @@ Panel.prototype = {
             this._statusBox.add(indicator.actor);
             this._menus.addMenu(indicator.menu);
         }
+
+        // PopupMenuManager depends on menus being added in order for
+        // keyboard navigation
+        this._menus.addMenu(this._statusmenu.menu);
     },
 
     startupAnimation: function() {